Remove deprecated code from GdkPango

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index e24d30843ea96141de869d5b3fedff73fd344c76..9f53575591a382bc78f2326c36a16bca0a6b75dc 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -870,7 +870,6 @@ gdk_pango_renderer_set_stipple
 gdk_pango_renderer_set_override_color
 gdk_pango_context_get
 gdk_pango_context_get_for_screen
-gdk_pango_context_set_colormap
 GdkPangoAttrEmbossed
 GdkPangoAttrEmbossColor
 GdkPangoAttrStipple

diff --git a/docs/reference/gdk/tmpl/pango_interaction.sgml b/docs/reference/gdk/tmpl/pango_interaction.sgml
index ac61ed9880a72b8465151b457fe282814d70dc68..b03c4b1df8e1979840b3a8538926f86575419908 100644 (file)
--- a/docs/reference/gdk/tmpl/pango_interaction.sgml
+++ b/docs/reference/gdk/tmpl/pango_interaction.sgml
@@ -222,15 +222,6 @@ g_object_unref (gc);
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_pango_context_set_colormap ##### -->
-<para>
-
-</para>
-
-@context: 
-@colormap: 
-
-
 <!-- ##### STRUCT GdkPangoAttrEmbossed ##### -->
 <para>
 A Pango text attribute containing a embossed bitmap to be used when

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 892f81049a031aa36f11276f10a826e84b31a379..fe3e0a671bbc3437df4a31ff1629b3b639d00b22 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -895,9 +895,6 @@ gdk_pango_attr_embossed_new
 gdk_pango_attr_stipple_new
 gdk_pango_context_get
 gdk_pango_context_get_for_screen
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_pango_context_set_colormap
-#endif
 gdk_pango_layout_get_clip_region
 gdk_pango_layout_line_get_clip_region
 gdk_pango_renderer_get_default

diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 825b238b795c8e86f0b6c88dd02cc404f3a1b98a..a4ca42436fb65e6e4bbb1d852a024664ce70e546 100644 (file)
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -764,24 +764,6 @@ gdk_pango_renderer_set_override_color (GdkPangoRenderer *gdk_renderer,
     priv->override_color_set[part] = FALSE;
 }
 
-/**
- * gdk_pango_context_set_colormap:
- * @context: a #PangoContext
- * @colormap: a #GdkColormap
- *
- * This function used to set the colormap to be used for drawing with
- * @context. The colormap is now always derived from the graphics
- * context used for drawing, so calling this function is no longer
- * necessary.
- **/
-void
-gdk_pango_context_set_colormap (PangoContext *context,
-                               GdkColormap  *colormap)
-{
-  g_return_if_fail (PANGO_IS_CONTEXT (context));
-  g_return_if_fail (colormap == NULL || GDK_IS_COLORMAP (colormap));
-}
-
 /* Gets a renderer to draw with, setting the properties of the
  * renderer and activating it. Note that since we activate the
  * renderer here, the implicit setting of the matrix that

diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index 39df0ef4d14f7479e5eccaa28fa2ff27727435a1..4a83783862f3286ee6f68adf7e8ed83a45e111e3 100644 (file)
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -108,10 +108,6 @@ PangoContext *gdk_pango_context_get_for_screen (GdkScreen    *screen);
 #ifndef GDK_MULTIHEAD_SAFE
 PangoContext *gdk_pango_context_get            (void);
 #endif
-#ifndef GDK_DISABLE_DEPRECATED
-void          gdk_pango_context_set_colormap   (PangoContext *context,
-                                                GdkColormap  *colormap);
-#endif 
 
 
 /* Get a clip region to draw only part of a layout or